Rename daemon autotest to partition

Change-Id: I1c2980ab668405496c63de7322503e7c14d8f991 Reviewed-by: Kevin Simons <kevin.simons@nokia.com> Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
author: Kevin Simons <kevin.simons@nokia.com> 2012-04-01 22:05:06 +0200
committer: Qt by Nokia <qt-info@nokia.com> 2012-04-10 20:18:08 +0200
commit: 9acbf29bc825bf4ce3c3c038ad91b7bc2be9add0 (patch)
tree: 564ba44f98534181c3576b104965137c3f93c490
parent: 1c8e341de9fc4d6ac891cb3d69e731f011631409 (diff)
146 files changed, 180 insertions, 178 deletions
diff --git a/src/partition/jsondbowner.h b/src/partition/jsondbowner.h
index 825cf80f..c3416103 100644
--- a/src/partition/jsondbowner.h
+++ b/src/partition/jsondbowner.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_HEADER
 
-class TestJsonDb;
+class TestPartition;
 struct passwd;
 
 QT_BEGIN_NAMESPACE_JSONDB_PARTITION
@@ -90,7 +90,7 @@ private:
     QMap<QString, QMap<QString, QList<JsonDbQuery *> > > mAllowedObjectQueries;
     int mStorageQuota;
     bool mAllowAll;
-    friend class ::TestJsonDb;
+    friend class ::TestPartition;
     bool _setOwnerCapabilities(struct passwd *pwd, JsonDbPartition *partition);
 };
 
diff --git a/src/partition/jsondbpartition.h b/src/partition/jsondbpartition.h
index ebd5ab03..3e7917ed 100644
--- a/src/partition/jsondbpartition.h
+++ b/src/partition/jsondbpartition.h
@@ -224,6 +224,7 @@ private:
     friend class JsonDbObjectTable;
     friend class JsonDbMapDefinition;
     friend class WithTransaction;
+    friend class ::TestPartition;
     friend class ::TestJsonDb;
 };
 
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7decff60..001898f9 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     client \
-    daemon \
+    partition \
     accesscontrol \
     qbtree \
     jsondb-listmodel \
diff --git a/tests/auto/client/test-jsondb-client.cpp b/tests/auto/client/test-jsondb-client.cpp
index c9262c97..13d353a5 100644
--- a/tests/auto/client/test-jsondb-client.cpp
+++ b/tests/auto/client/test-jsondb-client.cpp
@@ -1298,7 +1298,7 @@ void TestJsonDbClient::notifyMultiple()
 
 void TestJsonDbClient::mapNotification()
 {
-    QVariantList list = readJsonFile(":/json/auto/daemon/json/map-reduce.json").toArray().toVariantList();
+    QVariantList list = readJsonFile(":/json/auto/partition/json/map-reduce.json").toArray().toVariantList();
     QList<QVariantMap> mapsReduces;
     QList<QVariantMap> schemas;
     QMap<QString, QVariantMap> toDelete;
diff --git a/tests/auto/daemon/json-validation.qrc b/tests/auto/partition/json-validation.qrc
index 5153c741..5153c741 100644
--- a/tests/auto/daemon/json-validation.qrc
+++ b/tests/auto/partition/json-validation.qrc
diff --git a/tests/auto/daemon/json-validation/array-boundaries-schema.json b/tests/auto/partition/json-validation/array-boundaries-schema.json
index 59f001b9..59f001b9 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-schema.json
+++ b/tests/auto/partition/json-validation/array-boundaries-schema.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-empty-valid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-empty-valid.json
index 0b99c24e..0b99c24e 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-empty-valid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-empty-valid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-five-invalid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-five-invalid.json
index 93d0ec31..93d0ec31 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-five-invalid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-five-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-two-valid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-two-valid.json
index 697c5bed..697c5bed 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrLess-two-valid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrLess-two-valid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-empty-invalid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-empty-invalid.json
index b5f2d19b..b5f2d19b 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-empty-invalid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-empty-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-five-valid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-five-valid.json
index 133961dd..133961dd 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-five-valid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-five-valid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-one-invalid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-one-invalid.json
index 62a898f6..62a898f6 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-one-invalid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-one-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-two-valid.json b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-two-valid.json
index 4547d4cb..4547d4cb 100644
--- a/tests/auto/daemon/json-validation/array-boundaries-twoOrMore-two-valid.json
+++ b/tests/auto/partition/json-validation/array-boundaries-twoOrMore-two-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-empty-empty-valid.json b/tests/auto/partition/json-validation/array-items-empty-empty-valid.json
index 49950992..49950992 100644
--- a/tests/auto/daemon/json-validation/array-items-empty-empty-valid.json
+++ b/tests/auto/partition/json-validation/array-items-empty-empty-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-empty-mixed-valid.json b/tests/auto/partition/json-validation/array-items-empty-mixed-valid.json
index e1a0d8f3..e1a0d8f3 100644
--- a/tests/auto/daemon/json-validation/array-items-empty-mixed-valid.json
+++ b/tests/auto/partition/json-validation/array-items-empty-mixed-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-empty-numbers-valid.json b/tests/auto/partition/json-validation/array-items-empty-numbers-valid.json
index 712e146e..712e146e 100644
--- a/tests/auto/daemon/json-validation/array-items-empty-numbers-valid.json
+++ b/tests/auto/partition/json-validation/array-items-empty-numbers-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-empty-valid.json b/tests/auto/partition/json-validation/array-items-number-empty-valid.json
index 5ffae678..5ffae678 100644
--- a/tests/auto/daemon/json-validation/array-items-number-empty-valid.json
+++ b/tests/auto/partition/json-validation/array-items-number-empty-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-highnumbers-invalid.json b/tests/auto/partition/json-validation/array-items-number-highnumbers-invalid.json
index fc2347e4..fc2347e4 100644
--- a/tests/auto/daemon/json-validation/array-items-number-highnumbers-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-number-highnumbers-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-mixed-invalid.json b/tests/auto/partition/json-validation/array-items-number-mixed-invalid.json
index 2b7d65e2..2b7d65e2 100644
--- a/tests/auto/daemon/json-validation/array-items-number-mixed-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-number-mixed-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-numbers-valid.json b/tests/auto/partition/json-validation/array-items-number-numbers-valid.json
index 00986d93..00986d93 100644
--- a/tests/auto/daemon/json-validation/array-items-number-numbers-valid.json
+++ b/tests/auto/partition/json-validation/array-items-number-numbers-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-object-invalid.json b/tests/auto/partition/json-validation/array-items-number-object-invalid.json
index 3dd8b867..3dd8b867 100644
--- a/tests/auto/daemon/json-validation/array-items-number-object-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-number-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-number-string-invalid.json b/tests/auto/partition/json-validation/array-items-number-string-invalid.json
index d5ccf425..d5ccf425 100644
--- a/tests/auto/daemon/json-validation/array-items-number-string-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-number-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-empty-valid.json b/tests/auto/partition/json-validation/array-items-object-empty-valid.json
index 9a2f07d9..9a2f07d9 100644
--- a/tests/auto/daemon/json-validation/array-items-object-empty-valid.json
+++ b/tests/auto/partition/json-validation/array-items-object-empty-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-missingfoo-valid.json b/tests/auto/partition/json-validation/array-items-object-missingfoo-valid.json
index 94ee005f..94ee005f 100644
--- a/tests/auto/daemon/json-validation/array-items-object-missingfoo-valid.json
+++ b/tests/auto/partition/json-validation/array-items-object-missingfoo-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-missingid-invalid.json b/tests/auto/partition/json-validation/array-items-object-missingid-invalid.json
index e1f13cdc..e1f13cdc 100644
--- a/tests/auto/daemon/json-validation/array-items-object-missingid-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-object-missingid-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-numbers-invalid.json b/tests/auto/partition/json-validation/array-items-object-numbers-invalid.json
index 98949560..98949560 100644
--- a/tests/auto/daemon/json-validation/array-items-object-numbers-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-object-numbers-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-std-valid.json b/tests/auto/partition/json-validation/array-items-object-std-valid.json
index b8d3ffe2..b8d3ffe2 100644
--- a/tests/auto/daemon/json-validation/array-items-object-std-valid.json
+++ b/tests/auto/partition/json-validation/array-items-object-std-valid.json
diff --git a/tests/auto/daemon/json-validation/array-items-object-strings-invalid.json b/tests/auto/partition/json-validation/array-items-object-strings-invalid.json
index 35c1a0c4..35c1a0c4 100644
--- a/tests/auto/daemon/json-validation/array-items-object-strings-invalid.json
+++ b/tests/auto/partition/json-validation/array-items-object-strings-invalid.json
diff --git a/tests/auto/daemon/json-validation/array-items-schema.json b/tests/auto/partition/json-validation/array-items-schema.json
index c155ccd9..c155ccd9 100644
--- a/tests/auto/daemon/json-validation/array-items-schema.json
+++ b/tests/auto/partition/json-validation/array-items-schema.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-one-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-one-invalid.json
index 929d80a1..929d80a1 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-one-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-one-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-two-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-two-invalid.json
index fb694b0b..fb694b0b 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-two-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-two-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-zero-valid.json b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-zero-valid.json
index 8ab8beea..8ab8beea 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-lessThenOne-zero-valid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-lessThenOne-zero-valid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-one-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-one-invalid.json
index 9197c7df..9197c7df 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-one-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-one-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-two-valid.json b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-two-valid.json
index 4eeb4bbc..4eeb4bbc 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-two-valid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-two-valid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-zero-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-zero-invalid.json
index c60214f4..c60214f4 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-moreThenOne-zero-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-moreThenOne-zero-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-oneOrLess-one-valid.json b/tests/auto/partition/json-validation/integer-boundaries-oneOrLess-one-valid.json
index c18da6ca..c18da6ca 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-oneOrLess-one-valid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-oneOrLess-one-valid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-oneOrLess-two-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-oneOrLess-two-invalid.json
index 27468647..27468647 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-oneOrLess-two-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-oneOrLess-two-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-one-valid.json b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-one-valid.json
index 1eecd48a..1eecd48a 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-one-valid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-one-valid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-two-valid.json b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-two-valid.json
index e1bbfe04..e1bbfe04 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-two-valid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-two-valid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-zero-invalid.json b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-zero-invalid.json
index 848f6dc5..848f6dc5 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-oneOrMore-zero-invalid.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-oneOrMore-zero-invalid.json
diff --git a/tests/auto/daemon/json-validation/integer-boundaries-schema.json b/tests/auto/partition/json-validation/integer-boundaries-schema.json
index 5575d28e..5575d28e 100644
--- a/tests/auto/daemon/json-validation/integer-boundaries-schema.json
+++ b/tests/auto/partition/json-validation/integer-boundaries-schema.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-one-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-one-invalid.json
index 515feadc..515feadc 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-one-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-one-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-two-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-two-invalid.json
index b353576e..b353576e 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-two-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-two-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-zero-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-zero-valid.json
index c3dc2ed0..c3dc2ed0 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-lessThenOne-zero-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-lessThenOne-zero-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-one-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-one-invalid.json
index 16d07ce9..16d07ce9 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-one-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-one-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-two-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-two-valid.json
index bdc4068f..bdc4068f 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-two-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-two-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-zero-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-zero-invalid.json
index 5e5d8962..5e5d8962 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-moreThenOne-zero-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-moreThenOne-zero-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-one-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-one-valid.json
index 42600228..42600228 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-one-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-one-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-two-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-two-invalid.json
index 2ebecfcf..2ebecfcf 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-two-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-two-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-zero-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-zero-valid.json
index e554507a..e554507a 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrLess-zero-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrLess-zero-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-one-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-one-valid.json
index f7ce9d88..f7ce9d88 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-one-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-one-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-two-valid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-two-valid.json
index 5ef0d9e3..5ef0d9e3 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-two-valid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-two-valid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-zero-invalid.json b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-zero-invalid.json
index 4730c400..4730c400 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-oneOrMore-zero-invalid.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-oneOrMore-zero-invalid.json
diff --git a/tests/auto/daemon/json-validation/numbers-boundaries-schema.json b/tests/auto/partition/json-validation/numbers-boundaries-schema.json
index 74c02d96..74c02d96 100644
--- a/tests/auto/daemon/json-validation/numbers-boundaries-schema.json
+++ b/tests/auto/partition/json-validation/numbers-boundaries-schema.json
diff --git a/tests/auto/daemon/json-validation/required-missing-invalid.json b/tests/auto/partition/json-validation/required-missing-invalid.json
index b4453061..b4453061 100644
--- a/tests/auto/daemon/json-validation/required-missing-invalid.json
+++ b/tests/auto/partition/json-validation/required-missing-invalid.json
diff --git a/tests/auto/daemon/json-validation/required-nested-valid.json b/tests/auto/partition/json-validation/required-nested-valid.json
index f7571492..f7571492 100644
--- a/tests/auto/daemon/json-validation/required-nested-valid.json
+++ b/tests/auto/partition/json-validation/required-nested-valid.json
diff --git a/tests/auto/daemon/json-validation/required-notimportent-number-invalid.json b/tests/auto/partition/json-validation/required-notimportent-number-invalid.json
index a7325db0..a7325db0 100644
--- a/tests/auto/daemon/json-validation/required-notimportent-number-invalid.json
+++ b/tests/auto/partition/json-validation/required-notimportent-number-invalid.json
diff --git a/tests/auto/daemon/json-validation/required-number-valid.json b/tests/auto/partition/json-validation/required-number-valid.json
index 78b039a7..78b039a7 100644
--- a/tests/auto/daemon/json-validation/required-number-valid.json
+++ b/tests/auto/partition/json-validation/required-number-valid.json
diff --git a/tests/auto/daemon/json-validation/required-object-valid.json b/tests/auto/partition/json-validation/required-object-valid.json
index 6acfbdc1..6acfbdc1 100644
--- a/tests/auto/daemon/json-validation/required-object-valid.json
+++ b/tests/auto/partition/json-validation/required-object-valid.json
diff --git a/tests/auto/daemon/json-validation/required-schema.json b/tests/auto/partition/json-validation/required-schema.json
index 881e295b..881e295b 100644
--- a/tests/auto/daemon/json-validation/required-schema.json
+++ b/tests/auto/partition/json-validation/required-schema.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-max5chars-silo-valid.json b/tests/auto/partition/json-validation/string-boundaries-max5chars-silo-valid.json
index 368f132f..368f132f 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-max5chars-silo-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-max5chars-silo-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-max5chars-silos-valid.json b/tests/auto/partition/json-validation/string-boundaries-max5chars-silos-valid.json
index d1c98da8..d1c98da8 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-max5chars-silos-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-max5chars-silos-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-max5chars-toolong-invalid.json b/tests/auto/partition/json-validation/string-boundaries-max5chars-toolong-invalid.json
index c7bdfe18..c7bdfe18 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-max5chars-toolong-invalid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-max5chars-toolong-invalid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-min5chars-silo-invalid.json b/tests/auto/partition/json-validation/string-boundaries-min5chars-silo-invalid.json
index dc085e9b..dc085e9b 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-min5chars-silo-invalid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-min5chars-silo-invalid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-min5chars-silos-valid.json b/tests/auto/partition/json-validation/string-boundaries-min5chars-silos-valid.json
index 6663c273..6663c273 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-min5chars-silos-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-min5chars-silos-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-min5chars-toolong-valid.json b/tests/auto/partition/json-validation/string-boundaries-min5chars-toolong-valid.json
index f1d60b45..f1d60b45 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-min5chars-toolong-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-min5chars-toolong-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-pattern-a-valid.json b/tests/auto/partition/json-validation/string-boundaries-pattern-a-valid.json
index 1231c734..1231c734 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-pattern-a-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-pattern-a-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-pattern-aaa-valid.json b/tests/auto/partition/json-validation/string-boundaries-pattern-aaa-valid.json
index 8dc140af..8dc140af 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-pattern-aaa-valid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-pattern-aaa-valid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-pattern-ab-invalid.json b/tests/auto/partition/json-validation/string-boundaries-pattern-ab-invalid.json
index 253168fd..253168fd 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-pattern-ab-invalid.json
+++ b/tests/auto/partition/json-validation/string-boundaries-pattern-ab-invalid.json
diff --git a/tests/auto/daemon/json-validation/string-boundaries-schema.json b/tests/auto/partition/json-validation/string-boundaries-schema.json
index 3aea2432..3aea2432 100644
--- a/tests/auto/daemon/json-validation/string-boundaries-schema.json
+++ b/tests/auto/partition/json-validation/string-boundaries-schema.json
diff --git a/tests/auto/daemon/json-validation/type-array-array-valid.json b/tests/auto/partition/json-validation/type-array-array-valid.json
index 34425f30..34425f30 100644
--- a/tests/auto/daemon/json-validation/type-array-array-valid.json
+++ b/tests/auto/partition/json-validation/type-array-array-valid.json
diff --git a/tests/auto/daemon/json-validation/type-array-bool-invalid.json b/tests/auto/partition/json-validation/type-array-bool-invalid.json
index 437a46bc..437a46bc 100644
--- a/tests/auto/daemon/json-validation/type-array-bool-invalid.json
+++ b/tests/auto/partition/json-validation/type-array-bool-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-array-integer-invalid.json b/tests/auto/partition/json-validation/type-array-integer-invalid.json
index 41f67e4b..41f67e4b 100644
--- a/tests/auto/daemon/json-validation/type-array-integer-invalid.json
+++ b/tests/auto/partition/json-validation/type-array-integer-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-array-number-invalid.json b/tests/auto/partition/json-validation/type-array-number-invalid.json
index 15fca625..15fca625 100644
--- a/tests/auto/daemon/json-validation/type-array-number-invalid.json
+++ b/tests/auto/partition/json-validation/type-array-number-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-array-object-invalid.json b/tests/auto/partition/json-validation/type-array-object-invalid.json
index af4ab14d..af4ab14d 100644
--- a/tests/auto/daemon/json-validation/type-array-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-array-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-array-string-invalid.json b/tests/auto/partition/json-validation/type-array-string-invalid.json
index 01fb9038..01fb9038 100644
--- a/tests/auto/daemon/json-validation/type-array-string-invalid.json
+++ b/tests/auto/partition/json-validation/type-array-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-array-invalid.json b/tests/auto/partition/json-validation/type-bool-array-invalid.json
index c9bb7920..c9bb7920 100644
--- a/tests/auto/daemon/json-validation/type-bool-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-bool-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-false-valid.json b/tests/auto/partition/json-validation/type-bool-false-valid.json
index 7f809e1a..7f809e1a 100644
--- a/tests/auto/daemon/json-validation/type-bool-false-valid.json
+++ b/tests/auto/partition/json-validation/type-bool-false-valid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-integer-invalid.json b/tests/auto/partition/json-validation/type-bool-integer-invalid.json
index 1f6e88c5..1f6e88c5 100644
--- a/tests/auto/daemon/json-validation/type-bool-integer-invalid.json
+++ b/tests/auto/partition/json-validation/type-bool-integer-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-number-invalid.json b/tests/auto/partition/json-validation/type-bool-number-invalid.json
index 2943012f..2943012f 100644
--- a/tests/auto/daemon/json-validation/type-bool-number-invalid.json
+++ b/tests/auto/partition/json-validation/type-bool-number-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-object-invalid.json b/tests/auto/partition/json-validation/type-bool-object-invalid.json
index c763630d..c763630d 100644
--- a/tests/auto/daemon/json-validation/type-bool-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-bool-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-string-invalid.json b/tests/auto/partition/json-validation/type-bool-string-invalid.json
index 678468c0..678468c0 100644
--- a/tests/auto/daemon/json-validation/type-bool-string-invalid.json
+++ b/tests/auto/partition/json-validation/type-bool-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-bool-true-valid.json b/tests/auto/partition/json-validation/type-bool-true-valid.json
index a65bb225..a65bb225 100644
--- a/tests/auto/daemon/json-validation/type-bool-true-valid.json
+++ b/tests/auto/partition/json-validation/type-bool-true-valid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-array-invalid.json b/tests/auto/partition/json-validation/type-integer-array-invalid.json
index 75046728..75046728 100644
--- a/tests/auto/daemon/json-validation/type-integer-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-integer-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-bool-invalid.json b/tests/auto/partition/json-validation/type-integer-bool-invalid.json
index c5c25ed9..c5c25ed9 100644
--- a/tests/auto/daemon/json-validation/type-integer-bool-invalid.json
+++ b/tests/auto/partition/json-validation/type-integer-bool-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-double-invalid.json b/tests/auto/partition/json-validation/type-integer-double-invalid.json
index 50c93d7a..50c93d7a 100644
--- a/tests/auto/daemon/json-validation/type-integer-double-invalid.json
+++ b/tests/auto/partition/json-validation/type-integer-double-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-integer-valid.json b/tests/auto/partition/json-validation/type-integer-integer-valid.json
index f6922f01..f6922f01 100644
--- a/tests/auto/daemon/json-validation/type-integer-integer-valid.json
+++ b/tests/auto/partition/json-validation/type-integer-integer-valid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-object-invalid.json b/tests/auto/partition/json-validation/type-integer-object-invalid.json
index a3f1ee6a..a3f1ee6a 100644
--- a/tests/auto/daemon/json-validation/type-integer-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-integer-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-integer-string-invalid.json b/tests/auto/partition/json-validation/type-integer-string-invalid.json
index 4fcdc391..4fcdc391 100644
--- a/tests/auto/daemon/json-validation/type-integer-string-invalid.json
+++ b/tests/auto/partition/json-validation/type-integer-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-mixed-array-invalid.json b/tests/auto/partition/json-validation/type-mixed-array-invalid.json
index 0214a9bf..0214a9bf 100644
--- a/tests/auto/daemon/json-validation/type-mixed-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-mixed-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-mixed-double-invalid.json b/tests/auto/partition/json-validation/type-mixed-double-invalid.json
index 98683900..98683900 100644
--- a/tests/auto/daemon/json-validation/type-mixed-double-invalid.json
+++ b/tests/auto/partition/json-validation/type-mixed-double-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-mixed-number-valid.json b/tests/auto/partition/json-validation/type-mixed-number-valid.json
index 8a5ff6a7..8a5ff6a7 100644
--- a/tests/auto/daemon/json-validation/type-mixed-number-valid.json
+++ b/tests/auto/partition/json-validation/type-mixed-number-valid.json
diff --git a/tests/auto/daemon/json-validation/type-mixed-object-invalid.json b/tests/auto/partition/json-validation/type-mixed-object-invalid.json
index 87597e2d..87597e2d 100644
--- a/tests/auto/daemon/json-validation/type-mixed-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-mixed-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-mixed-string-valid.json b/tests/auto/partition/json-validation/type-mixed-string-valid.json
index abc8f382..abc8f382 100644
--- a/tests/auto/daemon/json-validation/type-mixed-string-valid.json
+++ b/tests/auto/partition/json-validation/type-mixed-string-valid.json
diff --git a/tests/auto/daemon/json-validation/type-number-array-invalid.json b/tests/auto/partition/json-validation/type-number-array-invalid.json
index 8afa6212..8afa6212 100644
--- a/tests/auto/daemon/json-validation/type-number-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-number-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-number-bool-invalid.json b/tests/auto/partition/json-validation/type-number-bool-invalid.json
index f1407060..f1407060 100644
--- a/tests/auto/daemon/json-validation/type-number-bool-invalid.json
+++ b/tests/auto/partition/json-validation/type-number-bool-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-number-double-valid.json b/tests/auto/partition/json-validation/type-number-double-valid.json
index 74b549a2..74b549a2 100644
--- a/tests/auto/daemon/json-validation/type-number-double-valid.json
+++ b/tests/auto/partition/json-validation/type-number-double-valid.json
diff --git a/tests/auto/daemon/json-validation/type-number-number-valid.json b/tests/auto/partition/json-validation/type-number-number-valid.json
index 27a667fa..27a667fa 100644
--- a/tests/auto/daemon/json-validation/type-number-number-valid.json
+++ b/tests/auto/partition/json-validation/type-number-number-valid.json
diff --git a/tests/auto/daemon/json-validation/type-number-object-invalid.json b/tests/auto/partition/json-validation/type-number-object-invalid.json
index 68c2e512..68c2e512 100644
--- a/tests/auto/daemon/json-validation/type-number-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-number-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-number-string-invalid.json b/tests/auto/partition/json-validation/type-number-string-invalid.json
index e19b9c88..e19b9c88 100644
--- a/tests/auto/daemon/json-validation/type-number-string-invalid.json
+++ b/tests/auto/partition/json-validation/type-number-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-object-array-invalid.json b/tests/auto/partition/json-validation/type-object-array-invalid.json
index 69e69855..69e69855 100644
--- a/tests/auto/daemon/json-validation/type-object-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-object-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-object-bool-invalid.json b/tests/auto/partition/json-validation/type-object-bool-invalid.json
index 1ee40176..1ee40176 100644
--- a/tests/auto/daemon/json-validation/type-object-bool-invalid.json
+++ b/tests/auto/partition/json-validation/type-object-bool-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-object-double-invalid.json b/tests/auto/partition/json-validation/type-object-double-invalid.json
index 5728ac01..5728ac01 100644
--- a/tests/auto/daemon/json-validation/type-object-double-invalid.json
+++ b/tests/auto/partition/json-validation/type-object-double-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-object-number-invalid.json b/tests/auto/partition/json-validation/type-object-number-invalid.json
index bd527110..bd527110 100644
--- a/tests/auto/daemon/json-validation/type-object-number-invalid.json
+++ b/tests/auto/partition/json-validation/type-object-number-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-object-object-valid.json b/tests/auto/partition/json-validation/type-object-object-valid.json
index f6b61530..f6b61530 100644
--- a/tests/auto/daemon/json-validation/type-object-object-valid.json
+++ b/tests/auto/partition/json-validation/type-object-object-valid.json
diff --git a/tests/auto/daemon/json-validation/type-object-string-invalid.json b/tests/auto/partition/json-validation/type-object-string-invalid.json
index 7f5a952a..7f5a952a 100644
--- a/tests/auto/daemon/json-validation/type-object-string-invalid.json
+++ b/tests/auto/partition/json-validation/type-object-string-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-schema.json b/tests/auto/partition/json-validation/type-schema.json
index 4aad2acd..4aad2acd 100644
--- a/tests/auto/daemon/json-validation/type-schema.json
+++ b/tests/auto/partition/json-validation/type-schema.json
diff --git a/tests/auto/daemon/json-validation/type-string-array-invalid.json b/tests/auto/partition/json-validation/type-string-array-invalid.json
index 10c491d9..10c491d9 100644
--- a/tests/auto/daemon/json-validation/type-string-array-invalid.json
+++ b/tests/auto/partition/json-validation/type-string-array-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-string-bool-invalid.json b/tests/auto/partition/json-validation/type-string-bool-invalid.json
index d19d1048..d19d1048 100644
--- a/tests/auto/daemon/json-validation/type-string-bool-invalid.json
+++ b/tests/auto/partition/json-validation/type-string-bool-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-string-double-invalid.json b/tests/auto/partition/json-validation/type-string-double-invalid.json
index af4b6ed3..af4b6ed3 100644
--- a/tests/auto/daemon/json-validation/type-string-double-invalid.json
+++ b/tests/auto/partition/json-validation/type-string-double-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-string-integer-invalid.json b/tests/auto/partition/json-validation/type-string-integer-invalid.json
index 681e09b6..681e09b6 100644
--- a/tests/auto/daemon/json-validation/type-string-integer-invalid.json
+++ b/tests/auto/partition/json-validation/type-string-integer-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-string-object-invalid.json b/tests/auto/partition/json-validation/type-string-object-invalid.json
index 5f7702c5..5f7702c5 100644
--- a/tests/auto/daemon/json-validation/type-string-object-invalid.json
+++ b/tests/auto/partition/json-validation/type-string-object-invalid.json
diff --git a/tests/auto/daemon/json-validation/type-string-string-valid.json b/tests/auto/partition/json-validation/type-string-string-valid.json
index 5122b734..5122b734 100644
--- a/tests/auto/daemon/json-validation/type-string-string-valid.json
+++ b/tests/auto/partition/json-validation/type-string-string-valid.json
diff --git a/tests/auto/daemon/json/array.json b/tests/auto/partition/json/array.json
index 9eff59fa..9eff59fa 100644
--- a/tests/auto/daemon/json/array.json
+++ b/tests/auto/partition/json/array.json
diff --git a/tests/auto/daemon/json/index-casepreference.json b/tests/auto/partition/json/index-casepreference.json
index 42b811a8..42b811a8 100644
--- a/tests/auto/daemon/json/index-casepreference.json
+++ b/tests/auto/partition/json/index-casepreference.json
diff --git a/tests/auto/daemon/json/index-casesensitive.json b/tests/auto/partition/json/index-casesensitive.json
index bcccd562..bcccd562 100644
--- a/tests/auto/daemon/json/index-casesensitive.json
+++ b/tests/auto/partition/json/index-casesensitive.json
diff --git a/tests/auto/daemon/json/largeContactsTest.json b/tests/auto/partition/json/largeContactsTest.json
index 7666c68f..7666c68f 100644
--- a/tests/auto/daemon/json/largeContactsTest.json
+++ b/tests/auto/partition/json/largeContactsTest.json
diff --git a/tests/auto/daemon/json/largeContactsTest10k.json b/tests/auto/partition/json/largeContactsTest10k.json
index bd9f91f0..bd9f91f0 100644
--- a/tests/auto/daemon/json/largeContactsTest10k.json
+++ b/tests/auto/partition/json/largeContactsTest10k.json
diff --git a/tests/auto/daemon/json/largeContactsTest1k.json b/tests/auto/partition/json/largeContactsTest1k.json
index 7666c68f..7666c68f 100644
--- a/tests/auto/daemon/json/largeContactsTest1k.json
+++ b/tests/auto/partition/json/largeContactsTest1k.json
diff --git a/tests/auto/daemon/json/largeContactsTest33k.json b/tests/auto/partition/json/largeContactsTest33k.json
index 5c6d37b2..5c6d37b2 100644
--- a/tests/auto/daemon/json/largeContactsTest33k.json
+++ b/tests/auto/partition/json/largeContactsTest33k.json
diff --git a/tests/auto/daemon/json/map-array-conversion.json b/tests/auto/partition/json/map-array-conversion.json
index b51aab00..b51aab00 100644
--- a/tests/auto/daemon/json/map-array-conversion.json
+++ b/tests/auto/partition/json/map-array-conversion.json
diff --git a/tests/auto/daemon/json/map-join-sourceuuids.json b/tests/auto/partition/json/map-join-sourceuuids.json
index 24ad24e7..24ad24e7 100644
--- a/tests/auto/daemon/json/map-join-sourceuuids.json
+++ b/tests/auto/partition/json/map-join-sourceuuids.json
diff --git a/tests/auto/daemon/json/map-join.json b/tests/auto/partition/json/map-join.json
index 75d5fb28..75d5fb28 100644
--- a/tests/auto/daemon/json/map-join.json
+++ b/tests/auto/partition/json/map-join.json
diff --git a/tests/auto/daemon/json/map-reduce-schema.json b/tests/auto/partition/json/map-reduce-schema.json
index 726d0cc0..726d0cc0 100644
--- a/tests/auto/daemon/json/map-reduce-schema.json
+++ b/tests/auto/partition/json/map-reduce-schema.json
diff --git a/tests/auto/daemon/json/map-reduce.json b/tests/auto/partition/json/map-reduce.json
index 2736a9cd..2736a9cd 100644
--- a/tests/auto/daemon/json/map-reduce.json
+++ b/tests/auto/partition/json/map-reduce.json
diff --git a/tests/auto/daemon/json/map-sametarget.json b/tests/auto/partition/json/map-sametarget.json
index f94c7843..f94c7843 100644
--- a/tests/auto/daemon/json/map-sametarget.json
+++ b/tests/auto/partition/json/map-sametarget.json
diff --git a/tests/auto/daemon/json/pk-capability.json b/tests/auto/partition/json/pk-capability.json
index eea7caeb..eea7caeb 100644
--- a/tests/auto/daemon/json/pk-capability.json
+++ b/tests/auto/partition/json/pk-capability.json
diff --git a/tests/auto/daemon/json/reduce-array.json b/tests/auto/partition/json/reduce-array.json
index 144513a4..144513a4 100644
--- a/tests/auto/daemon/json/reduce-array.json
+++ b/tests/auto/partition/json/reduce-array.json
diff --git a/tests/auto/daemon/json/reduce-data.json b/tests/auto/partition/json/reduce-data.json
index 810bf973..810bf973 100644
--- a/tests/auto/daemon/json/reduce-data.json
+++ b/tests/auto/partition/json/reduce-data.json
diff --git a/tests/auto/daemon/json/reduce-subprop.json b/tests/auto/partition/json/reduce-subprop.json
index a5002853..a5002853 100644
--- a/tests/auto/daemon/json/reduce-subprop.json
+++ b/tests/auto/partition/json/reduce-subprop.json
diff --git a/tests/auto/daemon/json/reduce.json b/tests/auto/partition/json/reduce.json
index 5939fb71..5939fb71 100644
--- a/tests/auto/daemon/json/reduce.json
+++ b/tests/auto/partition/json/reduce.json
diff --git a/tests/auto/daemon/daemon.pro b/tests/auto/partition/partition.pro
index 555d9fd2..bdb5b696 100644
--- a/tests/auto/daemon/daemon.pro
+++ b/tests/auto/partition/partition.pro
@@ -1,4 +1,4 @@
-TARGET = tst_daemon
+TARGET = tst_partition
 CONFIG += debug
 
 QT = network qml testlib jsondbpartition
@@ -9,13 +9,13 @@ LIBS += -L$$QT.jsondb.libs
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
+RESOURCES += json-validation.qrc partition.qrc
+
 unix:!mac:contains(QT_CONFIG,icu) {
     LIBS += -licuuc -licui18n
 } else {
     DEFINES += NO_COLLATION_SUPPORT
 }
 
-RESOURCES += json-validation.qrc daemon.qrc
-
 SOURCES += \
-    testjsondb.cpp \
+    testpartition.cpp \
diff --git a/tests/auto/daemon/daemon.qrc b/tests/auto/partition/partition.qrc
index 5ee38b61..a4332b49 100644
--- a/tests/auto/daemon/daemon.qrc
+++ b/tests/auto/partition/partition.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/daemon">
+    <qresource prefix="/partition">
         <file>json</file>
         <file>schemas</file>
     </qresource>
diff --git a/tests/auto/daemon/schemas/TestView.json b/tests/auto/partition/schemas/TestView.json
index 9f37750e..9f37750e 100644
--- a/tests/auto/daemon/schemas/TestView.json
+++ b/tests/auto/partition/schemas/TestView.json
diff --git a/tests/auto/daemon/schemas/address.json b/tests/auto/partition/schemas/address.json
index 76f5bdce..76f5bdce 100644
--- a/tests/auto/daemon/schemas/address.json
+++ b/tests/auto/partition/schemas/address.json
diff --git a/tests/auto/daemon/schemas/contact.json b/tests/auto/partition/schemas/contact.json
index 168ef20b..168ef20b 100644
--- a/tests/auto/daemon/schemas/contact.json
+++ b/tests/auto/partition/schemas/contact.json
diff --git a/tests/auto/daemon/schemas/ephemeral.json b/tests/auto/partition/schemas/ephemeral.json
index a065a976..a065a976 100644
--- a/tests/auto/daemon/schemas/ephemeral.json
+++ b/tests/auto/partition/schemas/ephemeral.json
diff --git a/tests/auto/daemon/testjsondb.cpp b/tests/auto/partition/testpartition.cpp
index e4eb6d30..0a810889 100644
--- a/tests/auto/daemon/testjsondb.cpp
+++ b/tests/auto/partition/testpartition.cpp
@@ -115,11 +115,11 @@ private:
     T mValue;
 };
 
-class TestJsonDb: public QObject
+class TestPartition: public QObject
 {
     Q_OBJECT
 public:
-    TestJsonDb();
+    TestPartition();
 
 private slots:
     void initTestCase();
@@ -266,13 +266,13 @@ const QString kReplica1Name = QString("replica1");
 const QString kReplica2Name = QString("replica2");
 const QStringList kReplicaNames = (QStringList() << kReplica1Name << kReplica2Name);
 
-TestJsonDb::TestJsonDb() :
+TestPartition::TestPartition() :
     mJsonDbPartition(0)
   , mOwner(0)
 {
 }
 
-void TestJsonDb::removeDbFiles()
+void TestPartition::removeDbFiles()
 {
     QStringList filters;
     filters << QLatin1String("*.db")
@@ -282,7 +282,7 @@ void TestJsonDb::removeDbFiles()
         QFile::remove(fileName);
 }
 
-void TestJsonDb::initTestCase()
+void TestPartition::initTestCase()
 {
     qsrand(QDateTime::currentDateTime().toTime_t());
     QCoreApplication::setOrganizationName("Example");
@@ -299,7 +299,7 @@ void TestJsonDb::initTestCase()
     mJsonDbPartition->open();
 }
 
-void TestJsonDb::cleanupTestCase()
+void TestPartition::cleanupTestCase()
 {
     if (mJsonDbPartition) {
         mJsonDbPartition->close();
@@ -313,12 +313,12 @@ void TestJsonDb::cleanupTestCase()
     removeDbFiles();
 }
 
-void TestJsonDb::cleanup()
+void TestPartition::cleanup()
 {
     QCOMPARE(mJsonDbPartition->mTransactionDepth, 0);
 }
 
-void TestJsonDb::reopen()
+void TestPartition::reopen()
 {
     int counter = 1;
     for (int i = 0; i < 10; ++i, ++counter) {
@@ -340,12 +340,12 @@ void TestJsonDb::reopen()
     }
 }
 
-void TestJsonDb::createContacts()
+void TestPartition::createContacts()
 {
     if (!mContactList.isEmpty())
         return;
 
-    QVariantList contactList = readJsonFile(":/daemon/json/largeContactsTest.json").toArray().toVariantList();
+    QVariantList contactList = readJsonFile(":/partition/json/largeContactsTest.json").toArray().toVariantList();
     QList<JsonDbObject> newContactList;
     foreach (QVariant v, contactList) {
         JsonDbObject contact(JsonDbObject::fromVariantMap(v.toMap()));
@@ -368,7 +368,7 @@ void TestJsonDb::createContacts()
 
 }
 
-JsonDbQueryResult TestJsonDb::find(JsonDbOwner *owner, const QString &query, const QJsonObject bindings)
+JsonDbQueryResult TestPartition::find(JsonDbOwner *owner, const QString &query, const QJsonObject bindings)
 {
     JsonDbQuery *parsedQuery = JsonDbQuery::parse(query, bindings);
     JsonDbQueryResult result = mJsonDbPartition->queryObjects(owner, parsedQuery);
@@ -376,7 +376,7 @@ JsonDbQueryResult TestJsonDb::find(JsonDbOwner *owner, const QString &query, con
     return result;
 }
 
-JsonDbWriteResult TestJsonDb::create(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
+JsonDbWriteResult TestPartition::create(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
 {
     JsonDbWriteResult result =  mJsonDbPartition->updateObject(owner, object, mode);
     if (result.code == JsonDbError::NoError) {
@@ -386,7 +386,7 @@ JsonDbWriteResult TestJsonDb::create(JsonDbOwner *owner, JsonDbObject &object, J
     return result;
 }
 
-JsonDbWriteResult TestJsonDb::update(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
+JsonDbWriteResult TestPartition::update(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
 {
     JsonDbWriteResult result =  mJsonDbPartition->updateObject(owner, object, mode);
     if (result.code == JsonDbError::NoError)
@@ -394,7 +394,7 @@ JsonDbWriteResult TestJsonDb::update(JsonDbOwner *owner, JsonDbObject &object, J
     return result;
 }
 
-JsonDbWriteResult TestJsonDb::remove(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
+JsonDbWriteResult TestPartition::remove(JsonDbOwner *owner, JsonDbObject &object, JsonDbPartition::WriteMode mode)
 {
     JsonDbObject toDelete = object;
     toDelete.insert(JsonDbString::kDeletedStr, true);
@@ -407,16 +407,16 @@ JsonDbWriteResult TestJsonDb::remove(JsonDbOwner *owner, JsonDbObject &object, J
 /*
  * const version for all the cleanup code that doesn't care about updated properties
  */
-JsonDbWriteResult TestJsonDb::remove(JsonDbOwner *owner, const JsonDbObject &object, JsonDbPartition::WriteMode mode)
+JsonDbWriteResult TestPartition::remove(JsonDbOwner *owner, const JsonDbObject &object, JsonDbPartition::WriteMode mode)
 {
     JsonDbObject toDelete = object;
     toDelete.insert(JsonDbString::kDeletedStr, true);
     return mJsonDbPartition->updateObject(owner, toDelete, mode);
 }
 
-void TestJsonDb::addSchema(const QString &schemaName, JsonDbObject &schemaObject)
+void TestPartition::addSchema(const QString &schemaName, JsonDbObject &schemaObject)
 {
-    QJsonValue schema = readJsonFile(QString(":/daemon/schemas/%1.json").arg(schemaName));
+    QJsonValue schema = readJsonFile(QString(":/partition/schemas/%1.json").arg(schemaName));
     schemaObject = JsonDbObject();
     schemaObject.insert(JsonDbString::kTypeStr, JsonDbString::kSchemaTypeStr);
     schemaObject.insert("name", schemaName);
@@ -425,7 +425,7 @@ void TestJsonDb::addSchema(const QString &schemaName, JsonDbObject &schemaObject
     verifyGoodResult(create(mOwner, schemaObject));
 }
 
-void TestJsonDb::addIndex(const QString &propertyName, const QString &propertyType, const QString &objectType)
+void TestPartition::addIndex(const QString &propertyName, const QString &propertyType, const QString &objectType)
 {
     JsonDbObject index;
     index.insert(JsonDbString::kTypeStr, JsonDbString::kIndexTypeStr);
@@ -437,7 +437,7 @@ void TestJsonDb::addIndex(const QString &propertyName, const QString &propertyTy
     verifyGoodResult(create(mOwner, index));
 }
 
-void TestJsonDb::computeVersion()
+void TestPartition::computeVersion()
 {
     JsonDbObject item0;
     QCOMPARE(item0.version(), QString());
@@ -592,7 +592,7 @@ void TestJsonDb::computeVersion()
     QCOMPARE(item9.version().mid(1), item1.version().mid(1));
 }
 
-void TestJsonDb::updateVersionOptimistic()
+void TestPartition::updateVersionOptimistic()
 {
     JsonDbObject master;
     master.generateUuid();
@@ -640,7 +640,7 @@ void TestJsonDb::updateVersionOptimistic()
 
 }
 
-void TestJsonDb::updateVersionReplicating()
+void TestPartition::updateVersionReplicating()
 {
     JsonDbObject master;
     master.generateUuid();
@@ -751,7 +751,7 @@ void TestJsonDb::updateVersionReplicating()
 /*
  * Create an item
  */
-void TestJsonDb::create()
+void TestPartition::create()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QString("create-test-type"));
@@ -782,7 +782,7 @@ void TestJsonDb::create()
  * Insert an item and then update it.
  */
 
-void TestJsonDb::update()
+void TestPartition::update()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QLatin1String("update-test-type"));
@@ -805,7 +805,7 @@ void TestJsonDb::update()
  * Update an item which doesn't exist
  */
 
-void TestJsonDb::update2()
+void TestPartition::update2()
 {
     JsonDbObject item;
     item.insert("update2-test", 100);
@@ -821,7 +821,7 @@ void TestJsonDb::update2()
  * Update an item which doesn't have a "uuid" field
  */
 
-void TestJsonDb::update3()
+void TestPartition::update3()
 {
     JsonDbObject item;
     item.insert("update2-test", 100);
@@ -834,7 +834,7 @@ void TestJsonDb::update3()
  * Update a stale copy of an item
  */
 
-void TestJsonDb::update4()
+void TestPartition::update4()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QLatin1String("update-test-type"));
@@ -895,7 +895,7 @@ void TestJsonDb::update4()
  * Create an item and immediately remove it
  */
 
-void TestJsonDb::remove()
+void TestPartition::remove()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QLatin1String("remove-test-type"));
@@ -922,7 +922,7 @@ void TestJsonDb::remove()
  * Try to remove an item which doesn't exist
  */
 
-void TestJsonDb::remove2()
+void TestPartition::remove2()
 {
     JsonDbObject item;
     item.insert("remove2-test", 100);
@@ -937,7 +937,7 @@ void TestJsonDb::remove2()
  * Don't include a 'uuid' field
  */
 
-void TestJsonDb::remove3()
+void TestPartition::remove3()
 {
     JsonDbObject item;
     item.insert("remove3-test", 100);
@@ -949,7 +949,7 @@ void TestJsonDb::remove3()
 /*
  * Try to remove an item which existed before but was removed
  */
-void TestJsonDb::remove4()
+void TestPartition::remove4()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QLatin1String("remove-test-type"));
@@ -973,7 +973,7 @@ void TestJsonDb::remove4()
 /*
  * Remove a stale version of the object
  */
-void TestJsonDb::remove5()
+void TestPartition::remove5()
 {
     jsondbSettings->setRejectStaleUpdates(true);
 
@@ -994,7 +994,7 @@ void TestJsonDb::remove5()
     jsondbSettings->setRejectStaleUpdates(false);
 }
 
-void TestJsonDb::schemaValidation_data()
+void TestPartition::schemaValidation_data()
 {
     QTest::addColumn<QByteArray>("schema");
     QTest::addColumn<QByteArray>("object");
@@ -1028,7 +1028,7 @@ void TestJsonDb::schemaValidation_data()
     }
 }
 
-void TestJsonDb::schemaValidation()
+void TestPartition::schemaValidation()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -1070,7 +1070,7 @@ void TestJsonDb::schemaValidation()
     jsondbSettings->setValidateSchemas(false);
 }
 
-void TestJsonDb::schemaValidationExtends_data()
+void TestPartition::schemaValidationExtends_data()
 {
     QTest::addColumn<QByteArray>("item");
     QTest::addColumn<bool>("isPerson");
@@ -1090,7 +1090,7 @@ void TestJsonDb::schemaValidationExtends_data()
             << QByteArray("{ \"name\":\"Alice's great-grandmother\", \"age\": 130}") << false << false;
 }
 
-void TestJsonDb::schemaValidationExtends()
+void TestPartition::schemaValidationExtends()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -1168,7 +1168,7 @@ void TestJsonDb::schemaValidationExtends()
 }
 
 
-void TestJsonDb::schemaValidationExtendsArray_data()
+void TestPartition::schemaValidationExtendsArray_data()
 {
     QTest::addColumn<QByteArray>("item");
     QTest::addColumn<bool>("isValid");
@@ -1185,7 +1185,7 @@ void TestJsonDb::schemaValidationExtendsArray_data()
             << QByteArray("{ \"waterSpeed\":100, \"landSpeed\": 100, \"airSpeed\": 100}") << true;
 }
 
-void TestJsonDb::schemaValidationExtendsArray()
+void TestPartition::schemaValidationExtendsArray()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -1262,7 +1262,7 @@ void TestJsonDb::schemaValidationExtendsArray()
     jsondbSettings->setValidateSchemas(false);
 }
 
-void TestJsonDb::schemaValidationLazyInit()
+void TestPartition::schemaValidationLazyInit()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -1353,7 +1353,7 @@ void TestJsonDb::schemaValidationLazyInit()
 
 #define LIST_TEST_ITEMS 6
 
-void TestJsonDb::createList()
+void TestPartition::createList()
 {
     JsonDbObjectList list;
     for (int i = 0 ; i < LIST_TEST_ITEMS ; i++ ) {
@@ -1371,7 +1371,7 @@ void TestJsonDb::createList()
  * Create a list of items and then update them
  */
 
-void TestJsonDb::updateList()
+void TestPartition::updateList()
 {
     JsonDbObjectList list;
     for (int i = 0 ; i < LIST_TEST_ITEMS ; i++ ) {
@@ -1391,7 +1391,7 @@ void TestJsonDb::updateList()
     QCOMPARE(result.objectsWritten.count(), LIST_TEST_ITEMS);
 }
 
-void TestJsonDb::mapDefinition()
+void TestPartition::mapDefinition()
 {
     // we need a schema that extends View for our targetType
     JsonDbObject schema;
@@ -1417,7 +1417,7 @@ void TestJsonDb::mapDefinition()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::mapDefinitionInvalid()
+void TestPartition::mapDefinitionInvalid()
 {
     // we need a schema that extends View for our targetType
     JsonDbObject schema;
@@ -1465,7 +1465,7 @@ void TestJsonDb::mapDefinitionInvalid()
     verifyGoodResult(res);
 }
 
-void TestJsonDb::reduceDefinition()
+void TestPartition::reduceDefinition()
 {
     // we need a schema that extends View for our targetType
     JsonDbObject schema;
@@ -1492,7 +1492,7 @@ void TestJsonDb::reduceDefinition()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::reduceDefinitionInvalid()
+void TestPartition::reduceDefinitionInvalid()
 {
     // we need a schema that extends View for our targetType
     JsonDbObject schema;
@@ -1577,7 +1577,7 @@ void TestJsonDb::reduceDefinitionInvalid()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::mapInvalidMapFunc()
+void TestPartition::mapInvalidMapFunc()
 {
     JsonDbObject schema;
     schema.insert(JsonDbString::kTypeStr, QLatin1String("_schemaType"));
@@ -1603,7 +1603,7 @@ void TestJsonDb::mapInvalidMapFunc()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::reduceInvalidAddSubtractFuncs()
+void TestPartition::reduceInvalidAddSubtractFuncs()
 {
     JsonDbObject schema;
     schema.insert(JsonDbString::kTypeStr, QLatin1String("_schemaType"));
@@ -1628,10 +1628,10 @@ void TestJsonDb::reduceInvalidAddSubtractFuncs()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::map()
+void TestPartition::map()
 {
     addIndex(QLatin1String("phoneNumber"));
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce.json").toArray());
 
     JsonDbObjectList mapsReduces;
     JsonDbObjectList schemas;
@@ -1731,9 +1731,9 @@ void TestJsonDb::map()
 }
 
 
-void TestJsonDb::mapDuplicateSourceAndTarget()
+void TestPartition::mapDuplicateSourceAndTarget()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-sametarget.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-sametarget.json").toArray());
     JsonDbObjectList toDelete;
     JsonDbObjectList maps;
 
@@ -1765,9 +1765,9 @@ void TestJsonDb::mapDuplicateSourceAndTarget()
     mJsonDbPartition->removeIndex("ContactView");
 }
 
-void TestJsonDb::mapRemoval()
+void TestPartition::mapRemoval()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-sametarget.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-sametarget.json").toArray());
 
     QList<JsonDbObject> maps;
     QList<JsonDbObject> toDelete;
@@ -1807,9 +1807,9 @@ void TestJsonDb::mapRemoval()
         verifyGoodResult(remove(mOwner, toDelete.at(ii)));
 }
 
-void TestJsonDb::mapUpdate()
+void TestPartition::mapUpdate()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-sametarget.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-sametarget.json").toArray());
 
     JsonDbObjectList maps;
     JsonDbObjectList toDelete;
@@ -1871,9 +1871,9 @@ void TestJsonDb::mapUpdate()
 
 }
 
-void TestJsonDb::mapJoin()
+void TestPartition::mapJoin()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-join.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-join.json").toArray());
 
     JsonDbObject join;
     JsonDbObject schema;
@@ -1974,11 +1974,11 @@ void TestJsonDb::mapJoin()
     mJsonDbPartition->removeIndex("value.foaf", "FoafPerson");
 }
 
-void TestJsonDb::mapSelfJoinSourceUuids()
+void TestPartition::mapSelfJoinSourceUuids()
 {
     addIndex("magic", "string");
 
-    QJsonArray objects(readJsonFile(":/daemon/json/map-join-sourceuuids.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-join-sourceuuids.json").toArray());
     JsonDbObjectList toDelete;
     JsonDbObject toUpdate;
 
@@ -2015,7 +2015,7 @@ void TestJsonDb::mapSelfJoinSourceUuids()
     mJsonDbPartition->removeIndex("magic", "string");
 }
 
-void TestJsonDb::mapMapFunctionError()
+void TestPartition::mapMapFunctionError()
 {
     JsonDbObject schema;
     schema.insert(JsonDbString::kTypeStr, QString("_schemaType"));
@@ -2054,7 +2054,7 @@ void TestJsonDb::mapMapFunctionError()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::mapSchemaViolation()
+void TestPartition::mapSchemaViolation()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -2064,7 +2064,7 @@ void TestJsonDb::mapSchemaViolation()
             remove(mOwner, toRemove);
     }
 
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce-schema.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce-schema.json").toArray());
     JsonDbObjectList toDelete;
     QJsonValue workingMap;
     JsonDbObject map;
@@ -2133,7 +2133,7 @@ void TestJsonDb::mapSchemaViolation()
 }
 
 // verify that only one target object per source object is allowed without targetKeyName
-void TestJsonDb::mapMultipleEmitNoTargetKeyName()
+void TestPartition::mapMultipleEmitNoTargetKeyName()
 {
     jsondbSettings->setValidateSchemas(true);
 
@@ -2143,7 +2143,7 @@ void TestJsonDb::mapMultipleEmitNoTargetKeyName()
             remove(mOwner, toRemove);
     }
 
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce-schema.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce-schema.json").toArray());
     JsonDbObjectList toDelete;
     JsonDbObject map;
 
@@ -2181,9 +2181,9 @@ void TestJsonDb::mapMultipleEmitNoTargetKeyName()
     jsondbSettings->setValidateSchemas(false);
 }
 
-void TestJsonDb::mapArrayConversion()
+void TestPartition::mapArrayConversion()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-array-conversion.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-array-conversion.json").toArray());
     JsonDbObjectList toDelete;
     JsonDbObject mapDefinition;
     for (int i = 0; i < objects.size(); i++) {
@@ -2232,7 +2232,7 @@ void logMessageOutput(QtMsgType type, const QMessageLogContext &context, const c
     }
 }
 
-void TestJsonDb::mapConsole()
+void TestPartition::mapConsole()
 {
     bool wasVerbose = jsondbSettings->verbose();
     bool wasDebug = jsondbSettings->debug();
@@ -2241,7 +2241,7 @@ void TestJsonDb::mapConsole()
     jsondbSettings->setVerbose(true);
     jsondbSettings->setDebug(true);
 
-    QJsonArray objects(readJsonFile(":/daemon/json/map-array-conversion.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-array-conversion.json").toArray());
     JsonDbObjectList toDelete;
     JsonDbObject mapDefinition;
     QLatin1Literal sourceType("com.test.Test");
@@ -2296,9 +2296,9 @@ void TestJsonDb::mapConsole()
         verifyGoodResult(remove(mOwner, toDelete.at(ii)));
 }
 
-void TestJsonDb::reduce()
+void TestPartition::reduce()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     JsonDbObjectList toDelete;
     JsonDbObjectList reduces;
@@ -2312,7 +2312,7 @@ void TestJsonDb::reduce()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
         JsonDbWriteResult result = create(mOwner, object);
@@ -2339,9 +2339,9 @@ void TestJsonDb::reduce()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceFlattened()
+void TestPartition::reduceFlattened()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     JsonDbObjectList toDelete;
     JsonDbObjectList reduces;
@@ -2355,7 +2355,7 @@ void TestJsonDb::reduceFlattened()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
         if (object.value(JsonDbString::kTypeStr).toString() == JsonDbString::kReduceTypeStr) {
@@ -2388,9 +2388,9 @@ void TestJsonDb::reduceFlattened()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceSourceKeyFunction()
+void TestPartition::reduceSourceKeyFunction()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     JsonDbObjectList toDelete;
     JsonDbObjectList reduces;
@@ -2404,7 +2404,7 @@ void TestJsonDb::reduceSourceKeyFunction()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
         if (object.value(JsonDbString::kTypeStr).toString() == JsonDbString::kReduceTypeStr) {
@@ -2437,9 +2437,9 @@ void TestJsonDb::reduceSourceKeyFunction()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceRemoval()
+void TestPartition::reduceRemoval()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     QJsonArray toDelete;
     QHash<QString, int> firstNameCount;
@@ -2451,7 +2451,7 @@ void TestJsonDb::reduceRemoval()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     JsonDbObject reduce;
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
@@ -2479,9 +2479,9 @@ void TestJsonDb::reduceRemoval()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceUpdate()
+void TestPartition::reduceUpdate()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     QJsonArray toDelete;
     QHash<QString, int> firstNameCount;
@@ -2495,7 +2495,7 @@ void TestJsonDb::reduceUpdate()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     JsonDbObject reduce;
     JsonDbObject schema;
     for (int ii = 0; ii < objects.size(); ii++) {
@@ -2542,9 +2542,9 @@ void TestJsonDb::reduceUpdate()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceDuplicate()
+void TestPartition::reduceDuplicate()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-data.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-data.json").toArray());
 
     JsonDbObjectList toDelete;
     QHash<QString, int> firstNameCount;
@@ -2558,7 +2558,7 @@ void TestJsonDb::reduceDuplicate()
         toDelete.append(object);
     }
 
-    objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    objects = readJsonFile(":/partition/json/reduce.json").toArray();
     JsonDbObject reduce;
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
@@ -2613,7 +2613,7 @@ void TestJsonDb::reduceDuplicate()
     mJsonDbPartition->removeIndex("MyContactCount");
 }
 
-void TestJsonDb::reduceFunctionError()
+void TestPartition::reduceFunctionError()
 {
     JsonDbObject schema;
     QString viewTypeStr("ReduceFunctionErrorView");
@@ -2652,11 +2652,11 @@ void TestJsonDb::reduceFunctionError()
     verifyGoodResult(remove(mOwner, schema));
 }
 
-void TestJsonDb::reduceSchemaViolation()
+void TestPartition::reduceSchemaViolation()
 {
     jsondbSettings->setValidateSchemas(true);
 
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce-schema.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce-schema.json").toArray());
 
     QJsonArray toDelete;
     JsonDbObject map;
@@ -2727,9 +2727,9 @@ void TestJsonDb::reduceSchemaViolation()
     jsondbSettings->setValidateSchemas(false);
 }
 
-void TestJsonDb::reduceSubObjectProp()
+void TestPartition::reduceSubObjectProp()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-subprop.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-subprop.json").toArray());
 
     QJsonArray toDelete;
     JsonDbObject reduce;
@@ -2767,9 +2767,9 @@ void TestJsonDb::reduceSubObjectProp()
     mJsonDbPartition->removeIndex("NameCount");
 }
 
-void TestJsonDb::reduceArray()
+void TestPartition::reduceArray()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce-array.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce-array.json").toArray());
     QJsonArray toDelete;
 
     JsonDbObject human;
@@ -2815,7 +2815,7 @@ void TestJsonDb::reduceArray()
     mJsonDbPartition->removeIndex("ArrayView");
 }
 
-void TestJsonDb::changesSinceCreate()
+void TestPartition::changesSinceCreate()
 {
     QJsonObject csRes = mJsonDbPartition->changesSince(0);
     QVERIFY(csRes.value(JsonDbString::kErrorStr).isNull());
@@ -2843,7 +2843,7 @@ void TestJsonDb::changesSinceCreate()
     QCOMPARE(after.value("lastName").toString(), toCreate.value("lastName").toString());
 }
 
-void TestJsonDb::addIndex()
+void TestPartition::addIndex()
 {
     addIndex(QLatin1String("subject"));
 
@@ -2858,16 +2858,16 @@ void TestJsonDb::addIndex()
     remove(mOwner, indexObject);
 }
 
-void TestJsonDb::addSchema()
+void TestPartition::addSchema()
 {
     JsonDbObject s;
     addSchema("contact", s);
     verifyGoodResult(remove(mOwner, s));
 }
 
-void TestJsonDb::duplicateSchema()
+void TestPartition::duplicateSchema()
 {
-    QJsonValue schema = readJsonFile(":/daemon/schemas/address.json");
+    QJsonValue schema = readJsonFile(":/partition/schemas/address.json");
     JsonDbObject schemaObject;
     schemaObject.insert(JsonDbString::kTypeStr, JsonDbString::kSchemaTypeStr);
     schemaObject.insert("name", QLatin1String("Address"));
@@ -2887,9 +2887,9 @@ void TestJsonDb::duplicateSchema()
     verifyGoodResult(result);
 }
 
-void TestJsonDb::removeSchema()
+void TestPartition::removeSchema()
 {
-    QJsonValue schema = readJsonFile(":/daemon/schemas/address.json");
+    QJsonValue schema = readJsonFile(":/partition/schemas/address.json");
     JsonDbObject schemaObject;
     schemaObject.insert(JsonDbString::kTypeStr, JsonDbString::kSchemaTypeStr);
     schemaObject.insert("name", QLatin1String("Address"));
@@ -2916,9 +2916,9 @@ void TestJsonDb::removeSchema()
     verifyGoodResult(result);
 }
 
-void TestJsonDb::removeViewSchema()
+void TestPartition::removeViewSchema()
 {
-    QJsonArray objects = readJsonFile(":/daemon/json/reduce.json").toArray();
+    QJsonArray objects = readJsonFile(":/partition/json/reduce.json").toArray();
     JsonDbObject schema;
     JsonDbObject reduce;
     for (int i = 0; i < objects.size(); ++i) {
@@ -2943,9 +2943,9 @@ void TestJsonDb::removeViewSchema()
     verifyGoodResult(result);
 }
 
-void TestJsonDb::updateSchema()
+void TestPartition::updateSchema()
 {
-    QJsonObject schema = readJsonFile(":/daemon/schemas/address.json").toObject();
+    QJsonObject schema = readJsonFile(":/partition/schemas/address.json").toObject();
     QVERIFY(!schema.isEmpty());
     JsonDbObject schemaObject;
     schemaObject.insert(JsonDbString::kTypeStr, JsonDbString::kSchemaTypeStr);
@@ -2978,7 +2978,7 @@ void TestJsonDb::updateSchema()
     verifyGoodResult(result);
 }
 
-void TestJsonDb::unindexedFind()
+void TestPartition::unindexedFind()
 {
     JsonDbObject item;
     item.insert("_type", QLatin1String("unindexedFind"));
@@ -3006,7 +3006,7 @@ void TestJsonDb::unindexedFind()
     remove(mOwner, item);
 }
 
-void TestJsonDb::find1()
+void TestPartition::find1()
 {
     JsonDbObject item;
     item.insert(JsonDbString::kTypeStr, QString("Find1Type"));
@@ -3019,7 +3019,7 @@ void TestJsonDb::find1()
     QVERIFY(queryResult.data.size() >= 1);
 }
 
-void TestJsonDb::find2()
+void TestPartition::find2()
 {
     addIndex(QLatin1String("name"));
     addIndex(QLatin1String("_type"));
@@ -3102,7 +3102,7 @@ QStringList strings = (QStringList()
 QStringList patterns = (QStringList()
         );
 
-void TestJsonDb::findLikeRegexp_data()
+void TestPartition::findLikeRegexp_data()
 {
     QTest::addColumn<QString>("pattern");
     QTest::addColumn<QString>("modifiers");
@@ -3135,7 +3135,7 @@ void TestJsonDb::findLikeRegexp_data()
     }
 }
 
-void TestJsonDb::findLikeRegexp()
+void TestPartition::findLikeRegexp()
 {
     QFETCH(QString, pattern);
     QFETCH(QString, modifiers);
@@ -3169,7 +3169,7 @@ void TestJsonDb::findLikeRegexp()
     QCOMPARE(length, expectedMatches.size());
 }
 
-void TestJsonDb::findInContains()
+void TestPartition::findInContains()
 {
     QList<QStringList> stringLists;
     stringLists << (QStringList() << "fred" << "barney");
@@ -3207,7 +3207,7 @@ void TestJsonDb::findInContains()
     mJsonDbPartition->removeIndex("i");
 }
 
-void TestJsonDb::findFields()
+void TestPartition::findFields()
 {
     addIndex(QLatin1String("name"));
     addIndex(QLatin1String("_type"));
@@ -3235,7 +3235,7 @@ void TestJsonDb::findFields()
     mJsonDbPartition->removeIndex(QLatin1String("firstName"));
 }
 
-void TestJsonDb::orderedFind1_data()
+void TestPartition::orderedFind1_data()
 {
     QTest::addColumn<QString>("order");
     QTest::newRow("asc") << "/";
@@ -3260,7 +3260,7 @@ void TestJsonDb::orderedFind1_data()
     create(mOwner, item3);
 }
 
-void TestJsonDb::orderedFind1()
+void TestPartition::orderedFind1()
 {
     QFETCH(QString, order);
 
@@ -3289,7 +3289,7 @@ void TestJsonDb::orderedFind1()
     mJsonDbPartition->removeIndex(QLatin1String("_type"));
 }
 
-void TestJsonDb::orderedFind2_data()
+void TestPartition::orderedFind2_data()
 {
     QTest::addColumn<QString>("order");
     QTest::addColumn<QString>("field");
@@ -3306,7 +3306,7 @@ void TestJsonDb::orderedFind2_data()
     }
 }
 
-void TestJsonDb::orderedFind2()
+void TestPartition::orderedFind2()
 {
     QFETCH(QString, order);
     QFETCH(QString, field);
@@ -3339,7 +3339,7 @@ void TestJsonDb::orderedFind2()
     }
 }
 
-void TestJsonDb::wildcardIndex()
+void TestPartition::wildcardIndex()
 {
     addIndex("telephoneNumbers.*.number");
     JsonDbObject item;
@@ -3364,7 +3364,7 @@ void TestJsonDb::wildcardIndex()
     mJsonDbPartition->removeIndex("telephoneNumbers.*.number");
 }
 
-void TestJsonDb::uuidJoin()
+void TestPartition::uuidJoin()
 {
     addIndex("name");
     addIndex("thumbnailUuid");
@@ -3446,7 +3446,7 @@ void TestJsonDb::uuidJoin()
     mJsonDbPartition->removeIndex("bettyUuid");
 }
 
-void TestJsonDb::orQuery_data()
+void TestPartition::orQuery_data()
 {
     QTest::addColumn<QString>("field1");
     QTest::addColumn<QString>("value1");
@@ -3499,7 +3499,7 @@ void TestJsonDb::orQuery_data()
     mJsonDbPartition->removeIndex(QLatin1String("key2"));
 }
 
-void TestJsonDb::orQuery()
+void TestPartition::orQuery()
 {
     QFETCH(QString, field1);
     QFETCH(QString, value1);
@@ -3525,7 +3525,7 @@ void TestJsonDb::orQuery()
     mJsonDbPartition->removeIndex("key2");
 }
 
-void TestJsonDb::findByName()
+void TestPartition::findByName()
 {
     createContacts();
     int count = mContactList.size();
@@ -3545,7 +3545,7 @@ void TestJsonDb::findByName()
     verifyGoodQueryResult(queryResult);
 }
 
-void TestJsonDb::findEQ()
+void TestPartition::findEQ()
 {
     createContacts();
     int count = mContactList.size();
@@ -3564,7 +3564,7 @@ void TestJsonDb::findEQ()
     mJsonDbPartition->removeIndex("name.last");
 }
 
-void TestJsonDb::find10()
+void TestPartition::find10()
 {
     createContacts();
     int count = mContactList.size();
@@ -3587,7 +3587,7 @@ void TestJsonDb::find10()
     mJsonDbPartition->removeIndex("contact");
 }
 
-void TestJsonDb::startsWith()
+void TestPartition::startsWith()
 {
     addIndex(QLatin1String("name"));
 
@@ -3634,7 +3634,7 @@ void TestJsonDb::startsWith()
     QCOMPARE(queryResult.data.size(), 4);
 }
 
-void TestJsonDb::comparison()
+void TestPartition::comparison()
 {
     addIndex(QLatin1String("latitude"), QLatin1String("number"));
 
@@ -3677,7 +3677,7 @@ void TestJsonDb::comparison()
     mJsonDbPartition->removeIndex(QLatin1String("latitude"));
 }
 
-void TestJsonDb::removedObjects()
+void TestPartition::removedObjects()
 {
     addIndex(QLatin1String("foo"));
     addIndex(QLatin1String("name"));
@@ -3723,11 +3723,11 @@ void TestJsonDb::removedObjects()
     mJsonDbPartition->removeIndex(QLatin1String("name"));
 }
 
-void TestJsonDb::arrayIndexQuery()
+void TestPartition::arrayIndexQuery()
 {
     addIndex(QLatin1String("phoneNumber"));
 
-    QJsonArray objects(readJsonFile(":/daemon/json/array.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/array.json").toArray());
     QMap<QString, JsonDbObject> toDelete;
     for (int i = 0; i < objects.size(); ++i) {
         JsonDbObject object = objects.at(i).toObject();
@@ -3780,7 +3780,7 @@ void TestJsonDb::arrayIndexQuery()
         verifyGoodResult(remove(mOwner, object));
 }
 
-void TestJsonDb::deindexError()
+void TestPartition::deindexError()
 {
     JsonDbWriteResult result;
 
@@ -3822,7 +3822,7 @@ void TestJsonDb::deindexError()
     }
 }
 
-void TestJsonDb::expectedOrder()
+void TestPartition::expectedOrder()
 {
     QStringList list;
     QStringList uuids;
@@ -3865,7 +3865,7 @@ void TestJsonDb::expectedOrder()
     }
 }
 
-void TestJsonDb::indexQueryOnCommonValues()
+void TestPartition::indexQueryOnCommonValues()
 {
     // Specific indexing bug when you have records inserted that only differ
     // by their _type
@@ -3905,7 +3905,7 @@ void TestJsonDb::indexQueryOnCommonValues()
     QCOMPARE(queryResult.data.size(), 1);
 }
 
-void TestJsonDb::removeIndexes()
+void TestPartition::removeIndexes()
 {
     addIndex("wacky_index");
     QVERIFY(mJsonDbPartition->findObjectTable(JsonDbString::kSchemaTypeStr)->indexSpec("wacky_index") != 0);
@@ -3931,7 +3931,7 @@ void TestJsonDb::removeIndexes()
     QVERIFY(mJsonDbPartition->findObjectTable("Index")->indexSpec("predicate") == 0);
 }
 
-void TestJsonDb::setOwner()
+void TestPartition::setOwner()
 {
     jsondbSettings->setEnforceAccessControl(true);
 
@@ -3971,7 +3971,7 @@ void TestJsonDb::setOwner()
     jsondbSettings->setEnforceAccessControl(false);
 }
 
-void TestJsonDb::indexPropertyFunction()
+void TestPartition::indexPropertyFunction()
 {
     JsonDbObject index;
     index.insert(JsonDbString::kTypeStr, QLatin1String("Index"));
@@ -4039,7 +4039,7 @@ void TestJsonDb::indexPropertyFunction()
 
 }
 
-void TestJsonDb::indexCollation()
+void TestPartition::indexCollation()
 {
 #ifndef NO_COLLATION_SUPPORT
     JsonDbObject item;
@@ -4136,9 +4136,9 @@ void TestJsonDb::indexCollation()
 #endif
 }
 
-void TestJsonDb::indexCaseSensitive()
+void TestPartition::indexCaseSensitive()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/index-casesensitive.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/index-casesensitive.json").toArray());
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
         JsonDbWriteResult result = create(mOwner, object);
@@ -4162,10 +4162,10 @@ void TestJsonDb::indexCaseSensitive()
     QCOMPARE(queryResult2.data.at(6).value("field").toString(), QLatin1String("aBB"));
 }
 
-void TestJsonDb::indexCasePreference()
+void TestPartition::indexCasePreference()
 {
 #ifndef NO_COLLATION_SUPPORT
-    QJsonArray objects(readJsonFile(":/daemon/json/index-casepreference.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/index-casepreference.json").toArray());
     for (int ii = 0; ii < objects.size(); ii++) {
         JsonDbObject object(objects.at(ii).toObject());
         JsonDbWriteResult result = create(mOwner, object);
@@ -4204,7 +4204,7 @@ void TestJsonDb::indexCasePreference()
 #endif
 }
 
-void TestJsonDb::managedBtree()
+void TestPartition::managedBtree()
 {
     const char mdbname[] = "tst_qmanagedbtree.db";
     const int numtags = 3;
@@ -4264,7 +4264,7 @@ void TestJsonDb::managedBtree()
     QFile::remove(mdbname);
 }
 
-void TestJsonDb::settings()
+void TestPartition::settings()
 {
     JsonDbSettings currentSettings;
     const QMetaObject *metaObject = jsondbSettings->metaObject();
@@ -4343,7 +4343,7 @@ void TestJsonDb::settings()
     }
 }
 
-void TestJsonDb::typeChangeIndex()
+void TestPartition::typeChangeIndex()
 {
     JsonDbObject test1;
     test1.insert(JsonDbString::kTypeStr, QLatin1String("TestContactTCI"));
@@ -4404,9 +4404,9 @@ void TestJsonDb::typeChangeIndex()
     verifyGoodResult(remove(mOwner, test2));
 }
 
-void TestJsonDb::typeChangeMap()
+void TestPartition::typeChangeMap()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce.json").toArray());
 
     JsonDbObjectList schemas;
     JsonDbObject map;
@@ -4461,7 +4461,7 @@ void TestJsonDb::typeChangeMap()
         verifyGoodResult(remove(mOwner, del));
 }
 
-void TestJsonDb::typeChangeReduce()
+void TestPartition::typeChangeReduce()
 {
     JsonDbObject test1;
     test1.insert(JsonDbString::kTypeStr, QLatin1String("MyContact"));
@@ -4473,7 +4473,7 @@ void TestJsonDb::typeChangeReduce()
     test2.insert(QLatin1String("firstName"), QLatin1String("Alice"));
     verifyGoodResult(create(mOwner, test2));
 
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce.json").toArray());
 
     JsonDbObject reduce;
     JsonDbObject schema;
@@ -4520,9 +4520,9 @@ void TestJsonDb::typeChangeReduce()
     verifyGoodResult(remove(mOwner, test2));
 }
 
-void TestJsonDb::typeChangeMapSource()
+void TestPartition::typeChangeMapSource()
 {
-    QJsonArray objects(readJsonFile(":/daemon/json/map-reduce.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/map-reduce.json").toArray());
 
     JsonDbObject map;
     JsonDbObject schema;
@@ -4587,7 +4587,7 @@ void TestJsonDb::typeChangeMapSource()
         verifyGoodResult(remove(mOwner, del));
 }
 
-void TestJsonDb::typeChangeReduceSource()
+void TestPartition::typeChangeReduceSource()
 {
     JsonDbObject test1;
     test1.insert(JsonDbString::kTypeStr, QLatin1String("MyContact"));
@@ -4599,7 +4599,7 @@ void TestJsonDb::typeChangeReduceSource()
     test2.insert(QLatin1String("firstName"), QLatin1String("Alice"));
     verifyGoodResult(create(mOwner, test2));
 
-    QJsonArray objects(readJsonFile(":/daemon/json/reduce.json").toArray());
+    QJsonArray objects(readJsonFile(":/partition/json/reduce.json").toArray());
 
     JsonDbObject reduce;
     JsonDbObject schema;
@@ -4680,7 +4680,7 @@ void TestJsonDb::typeChangeReduceSource()
     verifyGoodResult(remove(mOwner, changing));
 }
 
-void TestJsonDb::typeChangeSchema()
+void TestPartition::typeChangeSchema()
 {
     bool currentValidateSchemas = jsondbSettings->validateSchemas();
     jsondbSettings->setValidateSchemas(true);
@@ -4718,5 +4718,5 @@ void TestJsonDb::typeChangeSchema()
     jsondbSettings->setValidateSchemas(currentValidateSchemas);
 }
 
-QTEST_MAIN(TestJsonDb)
-#include "testjsondb.moc"
+QTEST_MAIN(TestPartition)
+#include "testpartition.moc"
diff --git a/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro b/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
index b7d048f7..f144050e 100644
--- a/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
+++ b/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
@@ -8,6 +8,6 @@ include($$PWD/../../shared/shared.pri)
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
-RESOURCES += ../daemon/daemon.qrc
+RESOURCES += ../partition/partition.qrc
 
 SOURCES += testqjsondbflushrequest.cpp
diff --git a/tests/auto/qjsondbrequest/qjsondbrequest.pro b/tests/auto/qjsondbrequest/qjsondbrequest.pro
index ab4b22ca..9ac6f240 100644
--- a/tests/auto/qjsondbrequest/qjsondbrequest.pro
+++ b/tests/auto/qjsondbrequest/qjsondbrequest.pro
@@ -9,7 +9,7 @@ include($$PWD/../../shared/shared.pri)
 DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
-RESOURCES += ../daemon/daemon.qrc
+RESOURCES += ../partition/partition.qrc
 
 SOURCES += testqjsondbrequest.cpp
 
diff --git a/tests/auto/qjsondbwatcher/qjsondbwatcher.pro b/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
index 008fb2c5..344b9414 100644
--- a/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
+++ b/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
@@ -9,6 +9,6 @@ include($$PWD/../../shared/shared.pri)
 DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
-RESOURCES += ../daemon/daemon.qrc
+RESOURCES += ../partition/partition.qrc
 
 SOURCES += testqjsondbwatcher.cpp
diff --git a/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp b/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
index e3b337a1..06593c7e 100644
--- a/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
+++ b/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
@@ -282,7 +282,7 @@ void TestQJsonDbWatcher::history()
 {
     QVERIFY(mConnection);
 
-    QFile dataFile(":/daemon/json/largeContactsTest.json");
+    QFile dataFile(":/partition/json/largeContactsTest.json");
     QVERIFY(dataFile.exists());
     dataFile.open(QIODevice::ReadOnly);
     QByteArray json = dataFile.readAll();
@@ -411,7 +411,8 @@ void TestQJsonDbWatcher::notificationTriggersView()
     QVERIFY(mConnection);
 
     QLatin1String query("[?_type=\"com.test.TestView\"]");
-    QJsonArray array(readJsonFile(":/daemon/json/map-array-conversion.json").array());
+    QJsonArray array(readJsonFile(":/partition/json/map-array-conversion.json").array());
+
     QList<QJsonObject> objects;
     foreach (const QJsonValue v, array)
         objects.append(v.toObject());
@@ -472,7 +473,7 @@ void TestQJsonDbWatcher::notificationTriggersMapReduce()
     QVERIFY(mConnection);
 
     QJsonParseError error;
-    QJsonArray array(readJsonFile(":/daemon/json/map-reduce.json", &error).array());
+    QJsonArray array(readJsonFile(":/partition/json/map-reduce.json", &error).array());
     QVERIFY(error.error == QJsonParseError::NoError);
     QList<QJsonObject> objects;
     foreach (const QJsonValue v, array)
@@ -557,7 +558,7 @@ void TestQJsonDbWatcher::typeChangeEagerViewSource()
     QVERIFY(mConnection);
 
     QJsonParseError error;
-    QJsonArray array(readJsonFile(":/daemon/json/map-reduce.json", &error).array());
+    QJsonArray array(readJsonFile(":/partition/json/map-reduce.json", &error).array());
     QVERIFY(error.error == QJsonParseError::NoError);
     QList<QJsonObject> objects;
     foreach (const QJsonValue v, array)
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml
index 4f4b3472..fc9061e6 100644
--- a/tests/auto/tests.xml
+++ b/tests/auto/tests.xml
@@ -6,9 +6,9 @@
         <description>Client library tests: C++ APIs testcases.</description>
         <step>cd /usr/lib/qt5jsondb-tests/auto/client;date &amp;&amp; ./tst_client&amp;&amp; date</step>
       </case>
-      <case name="tst_daemon" requirement="BAT" component="qt5jsondb"  timeout="2000">
-        <description> JsonDb daemon tests: This testcase tests server behavior.</description>
-        <step>cd /usr/lib/qt5jsondb-tests/auto/daemon;date &amp;&amp; ./tst_daemon &amp;&amp; date</step>
+      <case name="tst_partition" requirement="BAT" component="qt5jsondb"  timeout="2000">
+        <description> JsonDb partition tests: This testcase tests server behavior.</description>
+        <step>cd /usr/lib/qt5jsondb-tests/auto/partition;date &amp;&amp; ./tst_partition &amp;&amp; date</step>
       </case>
       <case name="tst_accesscontrol" requirement="BAT,CST" type="Security" component="qt5jsondb"  timeout="600">
         <description> JsonDb security tests</description>
diff --git a/tests/benchmarks/daemon/bench_daemon.cpp b/tests/benchmarks/daemon/bench_daemon.cpp
index 1beca5ef..a8711867 100644
--- a/tests/benchmarks/daemon/bench_daemon.cpp
+++ b/tests/benchmarks/daemon/bench_daemon.cpp
@@ -179,7 +179,7 @@ void TestJsonDb::initTestCase()
     mJsonDbPartition = new JsonDbPartition(kFilename, QStringLiteral("com.example.JsonDbTest"), mOwner, this);
     mJsonDbPartition->open();
 
-    QFile contactsFile(":/daemon/json/largeContactsTest.json");
+    QFile contactsFile(":/partition/json/largeContactsTest.json");
     QVERIFY(contactsFile.exists());
     contactsFile.open(QIODevice::ReadOnly);
     QByteArray json = contactsFile.readAll();
@@ -253,7 +253,7 @@ void TestJsonDb::cleanup()
 
 void TestJsonDb::addSchema(const QString &schemaName)
 {
-    QJsonValue schema = readJsonFile(QString(":/daemon/schemas/%1.json").arg(schemaName)).toArray();
+    QJsonValue schema = readJsonFile(QString(":/partition/schemas/%1.json").arg(schemaName)).toArray();
     JsonDbObject schemaDocument;
     schemaDocument.insert(JsonDbString::kTypeStr, JsonDbString::kSchemaTypeStr);
     schemaDocument.insert("name", schemaName);
@@ -379,7 +379,7 @@ void TestJsonDb::jsonObjectInsertValue()
 
 void TestJsonDb::benchmarkCreate()
 {
-    QJsonArray contacts(readJsonFile(":/daemon/json/largeContactsTest.json").toArray());
+    QJsonArray contacts(readJsonFile(":/partition/json/largeContactsTest.json").toArray());
     QBENCHMARK {
         JsonDbObject contact(contacts.at(0).toObject());
             mJsonDbPartition->updateObject(mOwner, contact);
@@ -388,7 +388,7 @@ void TestJsonDb::benchmarkCreate()
 
 void TestJsonDb::benchmarkFileAppend()
 {
-    QJsonArray contacts(readJsonFile(":/daemon/json/largeContactsTest.json").toArray());
+    QJsonArray contacts(readJsonFile(":/partition/json/largeContactsTest.json").toArray());
     QFile objectFile("objectFile.bin");
     objectFile.open(QIODevice::ReadWrite);
 
@@ -401,7 +401,7 @@ void TestJsonDb::benchmarkFileAppend()
 
 void TestJsonDb::benchmarkFileAppend2()
 {
-    QJsonValue bson(readJsonFile(":/daemon/json/largeContactsTest.json"));
+    QJsonValue bson(readJsonFile(":/partition/json/largeContactsTest.json"));
     QJsonArray contacts(bson.toArray());
     QFile objectFile("objectFile.bin");
     objectFile.open(QIODevice::ReadWrite);
diff --git a/tests/benchmarks/daemon/daemon.qrc b/tests/benchmarks/daemon/daemon.qrc
index 8e10790c..196207b0 100644
--- a/tests/benchmarks/daemon/daemon.qrc
+++ b/tests/benchmarks/daemon/daemon.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/daemon">
-        <file alias="json">../../auto/daemon/json</file>
-        <file alias="schemas">../../auto/daemon/schemas</file>
+        <file alias="json">../../auto/partition/json</file>
+        <file alias="schemas">../../auto/partition/schemas</file>
     </qresource>
 </RCC>
diff --git a/tests/json.qrc b/tests/json.qrc
index e3c3e82d..dc8a0d3a 100644
--- a/tests/json.qrc
+++ b/tests/json.qrc
@@ -6,6 +6,6 @@
         <file>auto/jsondblistmodel/list-objects.json</file>
         <file>auto/jsondbsortinglistmodel/list-objects.json</file>
         <file alias="dataset.json">auto/queries/dataset.json</file>
-        <file>auto/daemon/json/map-reduce.json</file>
+        <file>auto/partition/json/map-reduce.json</file>
     </qresource>
 </RCC>
author	Kevin Simons <kevin.simons@nokia.com>	2012-04-01 22:05:06 +0200
committer	Qt by Nokia <qt-info@nokia.com>	2012-04-10 20:18:08 +0200
commit	9acbf29bc825bf4ce3c3c038ad91b7bc2be9add0 (patch)
tree	564ba44f98534181c3576b104965137c3f93c490
parent	1c8e341de9fc4d6ac891cb3d69e731f011631409 (diff)